removed spaces on line end
consistent naming