more long lines and style nits