last coding style fixes