go back to original when starting comment
add semantic cleanup