It was a bit bulky and confusing
So I attempted to clean it up