code refactoring - create bundle