Minor clean up, working on adding ability to set grid lines on or off.

Update your feature/system_revamp branch.