RF: removed some redundant logic, comments, vars