general cleanup

Bundle functionality has been slightly extended and now contains methods
which should belong to its abstraction from the very beginning