futher code style fixes