Improved syntax
Refactoring