Refactoring + code comments