Cleaned up and made some changes.