Some code tidying since tab widths ruined everything