Refactor internals a bit