refactor code to make it more testable