Modernize

I have modernized, cleaned and simplified a few things.