Refacotring and adjusting table view height