Code cleanup; moved occupied info to map