cleaned up conditional classes