Refactoring and small corrections