Minor code clean up

Hopefully I didn’t break anything