Clean coding (40/48)

Clean coding