Moved Source and Resolution to private functions.