Minor code cleanup

Some minor code cleanup across game loop functions