clean code & comments & code improvement