Make everything a tiny bit more compact