[WIP] PSR-3 compliance

This is a work-in-progress for PSR-3 compliance.