Cleans up
Makes minor updates