CS changes and small refactoring
Fix for Composer files & new dependency (Buzz)