[CLEANUP] Drop closing PHP tags and do some more minor cleanup.