Various fixes

* Remove trailing spaces
* Remove closing PHP tag (useless and can cause some errors)

Thanks Darklg !