Removed deprecated template
Remove commented code
PEP8 cleanup
PEP8 cleanup
PEP8 cleanup
Merge pull request #242 from jvc26/cleanup

Cleanup