Made the code more readable, updated the changelog.
2 files changed