Werking on Refactor for syntax
Reafactoring