Fixes typo, cleans up interface