Clean up function declarations

Change-Id: I0ad09f02d1d09d6ce45bc204c8cd8d26ef663ddb