Style updates, minor fixes