Fixed most of style problems