Let me do some code clean-up.

https://ift.tt/3cgfoSU