fixed many indenting, style problems