Added REFACTOR comments - please review and resolve