Cleaned OSMLoader, still a bit ugly, but removed a lot of code duplication