Cleaned up Steelheart more.