Refactored pricipal fields get into one line for loop