trying to refactor to get var(var) declarations with default values
some improvments with comment handling- bug fix