Refactored comments :s