Tidy up of properties and service construction, could be better