Fixing code standards