Likewise here, I think we could shorten the code a bit.