Improve on comments

Improvements according to Patrik's comments.