package updated and code cleaned