Code Cleanup
Merge with the master