Refactoring + updating comments