code refactoring
started related management