from function declaration to function expression

Change-Id: I41937e05b909ffd56bca1803f2eb87e216628d6a