Fix service bugs + reformatting code to default