Small refactor, stop creating dummy data