Cleaned up the monster. Stylistic changes, removed redundant code,
some minor rewrites for speed