Clean up function declarations

Change-Id: I2478861e79bbb0f6d7e8a0b7bc59a81f457d92dc