Cleaned up else statement