Merge pull request #122 from bharrisau/cleanup1

Some cleanup of files and todos