Cleaning, refactoring and implementing declaration word weights. 
We need to test this.