fix and indent and service add