Refactor and comments