Refactored comments in codes