Refactoring
Simplifications