Making changes per Zwarg's comments