Refactoring, change of namespace, comments.