- Clean up some code