Move functions into their own block