Code cleaning and refactoring + base for kamouscuse