Small fixes with style