Clean up code
Revert "Clean up code"

This reverts commit 23ebbb3813b4b5814a70bd512d630637bb93645b.
Revert 23ebbb3..cf97add

This rolls back to commit 23ebbb3813b4b5814a70bd512d630637bb93645b.
Revert 9bf3787..c3992f5

This rolls back to commit 9bf3787c146ea235f81408f1c146e01253cd4c7d.