Swift-nize it a bit more