reorginization for clarity
reorginization for clarity