Refactoring

 On branch master
 Changes to be committed:
	modified:   improc