Added Goombas around map + Cleaned up code

Added Goombas around map + Cleaned up code