Code convention fixes