Changed names of some variables and restructured the style file