minor updates to style and flow