gustafn
committed
on 13 May 20
move code pieces around to centralize concerns