Added comments for service and factory