Minor Refactoring: Removing row padding
Minor refactoring: Removing redundant pieces