objective cleanup and restructuring