minor fixes with unnecessary else's