Reduced size of some functions