New deisgn clean up