code structure clean-up