PR for code review

Added more descriptive final variables.