Revert "General code clean-up"

This reverts commit d059dbf99d141804bc4a2bb71be5ffe8dc5feed2.