refactoring and drying up the code