Cleaned up OutputExtension code