Some cleanup of code
Some cleanup of code (objects in different files)