Napa changes - Tejas

Refactored some lines of code.