Add a new Date information in history and fix indentation and variable naming
Optimize code in MokaEnvironment
Fix indentation
Introduce several code optimizations