code refactoring overhaul
refactored code for Testikl