Cleaned up some doxy