Code cleanup and enhancements of Words Converter