Clean coding (6/48)

Clean coding