Slapped myself in the head and drastically simplified output