Fixes in code style -refs #6909