Jon's changes

I've done some cleanup