Converting tabs to spaces, cleaning up the formatting a little