Style cleanup and minor fixes