clean ups and changes