Reafactoring: remformated comments