Update v1.17; Did some code clean up for readability.