Code reordering / formatting.
Removed anonymous function callbacks for service response handling.