Cleaning up, fixing a few things. Can you believe my editor was using tabs instead of spaces? I know, right.