Refactored comments in src