fixed number of empty cells and cleaned a little