Defines Styles; Cleans up code, variables

Codejam with dean