Clean up
Clean up
Prefix methods
Merge pull request #25 from hyperoslo/feature/parse-relationships

Clean up