cleaned up some nasty methods