Refactor: format & comment patch