refactor and cleanup puppet module