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