Commented code and simplified bus object creation