refactored: commenting bug