Code cleanup and enhancements of Words Builder