bit of clean up with helper elements