Made controller and class code styles more uniform