Remap the comment function
Remove some white space