Clean up function declarations

Change-Id: I54f8a16cd64375d1398b6582175b0941ba68696e