refactor
refactor even more
remove log
change marker when adoption
remove log
Merge pull request #8 from OpenifyIt/fr_refactor

refactor