Clean up

Miscellaneous code clean up