Minor improvement before release

Improvements and cleanup.