Addressed change log suggestions, which modified some code and cleaned up syntax and usages.