clean code
Merge https://github.com/Teemsis/Odyssa