attempt at cleaning things up (broken)