Small refactor to centralise active-ness