Seems like a good suggestion, will rework