Style clean up