Refactoring client interface clean up concrete classes