Refactor to move Restaurant classes out of Activity class