Cleanup code. Add metadata w/ versionNumber