Minor compaction of code