Just minor cleanup
Cleanup and minor fixes