Initial backend cleanup
Merged
More cleanup of the backend
Merge pull request #21 from econchick/cleanup-backend

Cleanup backend