Refactor: PSR-1 basic coding standard
Core: Improved Update