Clean code and add some comment
Clean code and add some comment