variable name cleanup
changing API to be a bit more programable