coding convention fixes