Clean up function declarations

Change-Id: If482545f87a9b0c066f91639c55b73bee4d01b5c