cosmetic tweaks
removed some now unnecessary code