Refactor code
Comments about version