cleaning up naming a little