Better naming, cleanup