minor coding style changes and removal of console.log
Merge remote-tracking branch 'origin/master' into bootstrap