Now the limit is 80 chars per row, some pieces refactored