Fix/coding standards fixes