refactoring
refactoring, minor fixes