Fix coding standard, clean up