Big code improvement
Don't use <?= anymore