Dummy data, minor refactor