Bringing puppet code closer to style guide