Moved commment to service