Minor Cleanup

Working version with commented out console.log's.