fixing lint warning messages
added some comments to improve readability