Simplify internal implementation a bit