Cleaned up further.