Cleaned Up

No longer optimizes the lineup, but the code is easier to work with.
Going forward I'm going to integrate NumberJack which unfortunately
doesn't work on Windows...