remove fava
clean code
refactor