Unify and clean up convenience functions