Tightened a few things up