Cleaned up in prep to share with others