code clean up / package change