Refactor
TODO script is ready