Completed Map class; tidied up main class