Clean up globals, typos