Cleanup

Deleted extraneous stuff and reformatted code.