Ajay | #0000 | Cleanup - Removing commented out code
Ajay/DC | #0000 | Complicated the opening/closing placeholder for system variables