Tidying Up

Cleaning up some stuff