Better naming, tidying