Removed some cruft
Made several formatting tweaks
Made a few formatting tweaks