cleanup / review of latest commits
cleanup after reviewing latest changes