cleaned formatting up a bit, removed some superfluous stuff