Did some clean up. Nothing major changed