Cleaned up services definition (more organized)