Some small changes to reduce the size of the jar