cleaned up, all in single file to ensure puppet apply