Program: Mild cleanup
Merge pull request #41 from lioncash/clean

Program: Mild cleanup