remove console logs, clean some code