introduced mock-data.json and cleaned some code fragments