Few code cleaning, episode 2

Applying some standards like indentations, concatenations, PSR and strict comparison.

Just spending free time in good way ;)