Reviews refactoring and fixes