Clean up function declarations

Change-Id: Ie204bb9dc1fb4ded416087f5a3d962924b3dec82