Fixed style according to check style

As above, multiple files edited