Fix Coding Standards