formatting fix
comment unused code
small optimization fix