Jay's suggested code improvements.