Minor stylistic changes, got rid of dummy data