Cleaning up

Fixing some errors caused by the previous clean up