[#537] Fixes line length issues