Remove the TODO tags since they aren't relevant after testing
fix foodcritic violations
fix syntax errors
resolve more syntax errors
fix FC003
Merge pull request #2 from rackerjoe/US335

Merged automatically by jenkins after successful build test