clean up conditionals