made it a bit more compact