Quick refactor and comment