code refactoring 00