comment tidyup and remove log statements