cleaned up junk and reorganized