Style clean-up