Added line number support, fixed comment block removal