cleaned-up log statements