Removes dupe code, renames interface