removing console.logs
many improvements