minor optimization/cleanup