Code Cleanup, Rearranged Object Hierarchy