Clean up function declarations

Change-Id: I5d3ed0a266f327dbc8d506090221c43ef89fbcc0