Refactored verbose code