Minor refactoring.
Updated assembly version.