Update to adhere to project standards, removed block comments