Revert "clean code"

This reverts commit 164e138f48d270101a256f6e12ec242c90c5390b, reversing
changes made to a7f4eb2f4da8d5d7ff635324e4f154e71528d0c4.
Revert a58af31..d9eb248

This rolls back to commit a58af31c16257c91d8d6da3f811811ccde827610.