Code style

Some minor code style unification, at your discretion.