Clean up function declarations

Change-Id: I448e0cf2abeeafb0f6266baeb95705b3a11705a4