cleanup code to support puppet best practices
fix parameters names, reorder dependencies