Revert "cleaned up code"

This reverts commit dfaa603d8953690e75099f94931bffe899b7a7c8.