Finetuning: for better clarity, rename feature and private variable and reword comments; feature test code a bit more compact