Fixing long lines and cleaning up