Removed the credit card info. Some minor cleanups