Clean up

Initial clean up from Ev's fork and orientation. First commit!