Refactoring + Review feedback