Cleaned up and renamed the items