updates to elevate my code to scratch standards