Style updates & other clean up