Fixing if/else statements