Merging in cleaned up files from master