Merged local project and also formatted code.