MAG-01 Code and comments refactoring.