Clean up part 2, added interface to map loader