[Minor] Style cleanup for a number of functions