Fix all style bugs