Fix some chore styling issues