The code is cleaned
Some comments and docs are added