Code structure clean-up