Finish code cleanup
Merge branch 'cleanUp' into develop