Clean up function declarations

Change-Id: I18125ac6c58c89f76c3a6cfb3a7ee77b1059aeb1