Bunch of stylistic changes

As requested by @dmdj03