minor cleanup and removing some prints