Code style fixes
Fix: using late static binding