Time for action — refactoring our code so it's not redundant