Passing all tests!!!
I made things cleaner