Adhere more to coding guidelines