Clean up conditional statements