#90 Streamline if statements