Added restaurants (ready for data), fixed and cleaned code