auto refactoring and codereview upd