refactor
comment cleanup