Clean up function declarations

Change-Id: Ife3cb18d22c57c9c2e59317b68cf11a4bf94a40a