cleaned up attributes package