better commentary and hiearchy