Some Formatting with PHPStorm autoformat function (PSR1/2)
Finishing started work like template etc.