Refactored basic code
Map ++