starfpy tidied up