Tidied Systick some more