Re: Move functions to remove function declaration