Minor cleanup
Fixes #45 "Sporadic GUI freeze"