code cleaned from useless comments