PSR-2. Made config cacheable. Removed cruft.