Fix/coding standards