clean code in progress