Small Modifications

Made some small improvements for code cleanup. Also, had to fix some
things in BlackJack due to changes.