code cleanup & documenation
fix issue while provisioning