Refactor code to make it easier to use