cleaned up some variables, white space, and tucked some one-liners into methods in style_init