Clean up function declarations

Change-Id: Ia4ed1d576cb3bcf46de3225e5569f9cfd15a6f7e