Update use of sigma_clip in prepare;  PEP8 + clean-up