* Clean up some code