Clean up function declarations

Change-Id: Ic00323f1c22f9b3642758dc21b65a2413624515e