Removing thisSession variable, enhancing log statements