Style update + PSR-4 compatibility