Made a few more style tweaks. Still have a little more work to do with chips though.