Checkstyle fixes and ImageBundle