Improve puppet scripts