fixing up some styling and variables