cleaned up entry points a bit