Cleaned up conditionals