A bit of clean up

Cleaning some stuff