fixing long line issues