added spaces around operators, removed elseif's