Service: Fixed indentation and many other things
