Improved Formatting

 - Improved Formatting
 - Simplified services.h from Jon Sutherland