:+1: agreed, I'll try to clean this up