The new map is done - Is it Okay? Fixes#6
comment#6 Is that map okay?
Some code refactoring using JSLint and JSHint