Cleanedup code-comments