That's a good point.
I'm not worried much about space, though. I plan on excluding some of the uninteresting files, which means it will stay under 500 lines.

I think the current style is closer to how one would write production code.