Refactoring + Comments