Cleaned up session code / template.