[SQUASH ME] some coding convention fixes