Clean up more coding...