Refactor in FP way
Add tests
Xebian is identified by its email
clean up screens