Add in some better code style stuff