Clean things up a bit
All one line