Make things more compact