New code, more "rust style"