Clean coding (4/48)

Clean coding