style
comment bug fixed
style improvements