Minor optimization... ?