Minor code changes + style following review