Code Style Clean up.