refactoring report and fixing session validation