Will do, will refactor Monday.