refactoring
first round of refactoring
comment conversions