cleaned up code a bit --- mostly comments but some small tweaks too