Tidy up style organization