Refectored Code to run Easy 2