Update changelog
Update inline documentation and cleanup