code cleanup: line lengths