[PATCH 1/2] style fixes