Cleaned up armor package