Cleaned up and updated all