392.94 Small changes in refactoring