Reworked designing for refactoring post