Bring bundle up to coding standards
Bring bundle up to coding standards