New class for generation map, cleaning and refactoring (thx to
MrSchneeflug)