Cleaned up table view method