Fix php 5.4 notation and trailing spaces