More files clean up, 4 files still have a lot of errors
Merge pull request #2 from charlesdurham/robs

More files clean up, 4 files still have a lot of errors