Cleanup and preparing to merge back to master