clean up code smells