Fixes #44 – data cleanup