Minor tweaks from review - final fields, formatting, simplified methods