Fix: Apply some fixes in regard to comments

Feel free to cherry-pick!