comments deleted, code cleaned