Refactored strings and TableView