added option to add or remove rows
Small cleanup