Adding missing semicolons and removing redundant row/columns assignments
Refactoring, etc