PHP strict compliance
Fix sorting
Clean up previous