Some updates to make the project cleaner for a public repo.