Revert "Clean Code"

This reverts commit 15b88e6e58c4b3a8273b9fbe9e752f2cc819138b.