code refactoring
minor update