some space-saving changes