Apply OOP submitting lab 05

No need for the `( )`'s -- if it helps you read it, keep it. If not, would be cleaner to drop.