Cleaned up else if statements