small changes to save space