Clean up function declaration

Change-Id: I3c38149f9c99b45170f44f48725087cbe5dba40e