Cleaned up Maps & checked for #113