Moved variable declarations to the top, and no longer using the hiera() syntax.