some cleanup. Added line class