Make comments and folding pretty