Related to #3417232 Fixed comments on the relevant places and also fixed coding standards where needed.