Cleaned up processing.