Fixing typos
Cleanup