Style clean ups