Fake
First refactoring steps