Updated documentation and Changelog
Minor refactoring