Code review changes for #172.