function definition cleanup

Change-Id: I1f6bb4405f09c0c863d0bd1c77340636abdbae69
3 files changed