Rationalize includes and header files
Minor code and comments refactoring
Towards a more dynamic cloud management