Styles

This is part of what is contained in PR27 from Metallicow.

Mainly style changes, a few white space stuff and an xrange to range change.

Don't want to step on any ones toes, but hope this is helpful.