Simplified code while I was here.