Adjust comment styles consistency and a few code changes