Fixed map breaking-out issue
Cleanup