refactoring, cleanup, release preparations