Short tags fix, again.
Prettify code abit