Make style changes based on code review