Slight cleanup, still doesn't seem to work in word