clean up and completed Word model