Unify some notational conventions and do some more clenaup