Simplify line counting

Only line count simplifications on this