Styling

WIP not yet ready to merge.