Refactor PrettyPrint to remove useless types