Cleanup and semantics

Keep things looking consistent