comments, code clean