Refactors the current/notcurrent code