And cleaned that up a bit too