Cleaning Conditionnals and still refactoring