GEneral code clean up package