Code style improvements (comments,...)