cleanup and refactoring of customer side