refactoring, resolved #40