Adhere to code styling guide