Minor main cleanup