Isn't 綺麗 pretty? Does it mean "clean" too?
Indeed. It also can be used to mean "neat".
You can have pretty but still dirty clothes. This is silly to use the same word.
You should inform Japan that they need to change their language.