added a few clean-up to changes to mario
added a few clean-up to changes to mario