commented refactored version