refactor and cleanup Words