3.0 - Fix coding standards