some small changes to reduce size