Fix codestyle issues in code