Making this safer to run, and easier to read.