code refactored comments out