Lots of cleanup and notating