Clean up my last commit a bit