Added comment of todo.
Some commit.
Refactoring.
Refactoring and used functions of CollectionUtils.
Amended comment.
Added StateUtils and used methods of StateUtils.
Some commit.
Some commit.
Refactoring.
Some commit.
Some commit.
Refactoring.
Refactoring.
Some commit.