Fixed most style issues