whoops, refactor

spoke too soon thinking I was all smart