Fix coding standards

Fix coding standards