Refactor
Refector
Using double quotes
Some fixes