Fixing coding standards and strict errors