Some minor code style fixes