more style and convention fixes