Fixed more formatting issues, and restructured to use unless over negative if