Fix coding styles issues according to comments in linked pull request