Minor optimization/cleanup