some cleanup after merge

Here are the changes that I made after the merge. I tried the checkout, but it's still not rendering the level. It wasn't clear from your directions where the checkout version would be placed, so I think I'm still on my fork that's broken.