Code styling and fixes per codereview.