cleanup and adding cr & pupil, reducing size of dtype