Cloudstack implementation : code cleaning
Cloudstack implementation : code cleaning