Clean up function declarations

Change-Id: Id628629bdab2aa9446d449bc091a7bb82dab54eb