Cleaning up code slightly for call tonight 2
Cleaning up code slightly for call tonight 3