refactoring, minor update