[OWL-1997] Code improvement.
[OWL-1997] Code improvement.

Cepave/open-falcon-backend,Cepave/open-falcon-backend,Cepave/open-falcon-backend,Cepave/open-falcon-backend,Cepave/open-falcon-backend,Cepave/open-falcon-backend