Code clean up
Code refactoring and container mods