Fix styles and lint