Added refactor comments / questions