[NH] Minor cleanup and add in schema as an explicit dependency.
Merge pull request #1 from turbovote/minor-cleanup

[NH] Minor cleanup and add in schema as an explicit dependency.