Fixing a few more style things