cleaning up vspace and comments