Minor optimization attempts