Another little tidy up
Step towards removing global var x and replacing with passed in epoch
Removed hand waving for stop
Removed a global variable