little refactor -5 lines
more code deletion
use string extension
more maps