Improve session id formatting