- refactored comments a bit