(WIP) Fix line lengths