Make more compact