refactoring about done for now