Style changes

Went from hideous to ugly - progress!