Add description to long and short variable names
Slightly imporvement to redundant conditional operator rule