Clean coding (48/48)

Clean coding