clean code for new design