A bit of cleanup and improvement. This is cleaner and more readable.