Removed repetition of logging and global eval invocation