spring cleaning (move code)