Minor - format code
Fixing session special page see BT#8700
Minor - removing whitespaces.