Code Cleanup
Merge branch 'master3'