FINAL with controls description but need guidance for refactoring