Clean up function declarations

Change-Id: Ia33a39c9c8fe25c48c81c53270ca9ce5ef90221c