clean up the methods a bit