standardizing whitespace
cleaning up some unnecessary files, removing exception dependency