Refactored comments and logical methods