Clean up function declaration

Change-Id: I92c54f61fe8608d788cc236956f4a5a58e20a7df