Enforced curly braces on variables, changed column widths, program a little less verbose (-i reverts)