Final style work

(for now)