Minor cleanup of discarded code & preparing for new ISR