Cleaned things up, made it better.

Was causing grief in other functions.