Updated map, removed 3 classes, optimized code