add comment and tiny refactoring...