Corrected naming of RSL variables/ Refactored some hardcoded constants