Removed dummy data.
Minor refactoring.