Single line ifs are poop, fixed