Coment clean up