Clean up function declarations

Change-Id: Ie9081e6ed0840fad98f52f9755767788db77f406