Adhere to code styling guide -- part 2