Further cleanup in code. Preparing for a first release.