Coding standards fixed