Refactored by applying lint suggested modifications,...
Refactored by applying lint suggested modifications, adding/updating/formatting comments and correcting white-spacings/line-breakings. Task: https://schluss.atlassian.net/browse/BETA-2401
Edited by Pasindu Jayanath