cleaned from comments