Style and other minor updates