Misc refactoring for better code organisation. Test on suspicious (overlapping or not separated) pieces