refactoring, changes towards the first release