[WIP] PHP Code Polishing