Code convention fixes
More code convention fixes