Small design change that was bugging me