code refactoring
add comment
Merge pull request #1 from dead-horse/rebuild

code refactoring