Clean Code
Changes