Refactor code to be more OO