refactoring, verboseness, bugfix