cleaning up new session store module a little