refactoring and getting rid of code clones