Fix #7 and condense columns a bit