add some comments to indicate refactoring
Remove inner whitespaces for solution checking (type "source")