more coding  convention fixes