Cleaning & simplifying Bundle class