Refactoring
Removed assert