Cleaning up code slightly for call tonight 2