Clean coding (30/48)

Clean coding