wp-1328 fix code styling issues;