Cleanup
Merge pull request #4 from Versal/cleanup

[SEE NOTE BEFORE MERGING] Cleanup