Removed some console.log notices, and other minor clean-up.