refactored comments out