Style and fixes