Minor optimization of result