Some general code style cleanup