Basic Style clean-up