Fx: cleaned up package object