Nothing much...bit more refactoring