Clean up
Fixed points skipping bug for transformations