Implemented suggested code layout changes