More coding standards Fixes