Revert "Made code even more pretty."

This reverts commit cd1dd77df270709d22f4d49892f8a961d009ea97.
Reverse some changes & Fixed bugs