cleaning up that awful implementation