Some cleanup from my last commit