psr-2 update
Make bundle work with cleaner interfaces