Removed unnecessary params, cleaned codes