Done refactoring, ready for new release