Implementing some Brett styling suggestions