Style updates, cleanup