tons of styling

Just opening a PR for now, do not merge.