Cleanup some old coding style...