Finishing proximal_words changes

Plus tweaks to clean! method.