Cleanup and some useful comments