Refactoring; version 2.0.8 release.