Post code review. Cleaned up a bunch of stuff. The clear button now
works.