code refactoring…..