More Code style fixes. #187.