Make it more compact