Cleanup mostly
Update from a while ago