Fixed others style issues