Clean up manual linecounting with the stdlib
Whitespace