some fixes on line-length