More cleanup
Converted spaces to tabs
Added 'Word' (yet unused)