amended code according to pull request reviews
amended code according to pull request reviews

MichMich/MagicMirror,MichMich/MagicMirror,MichMich/MagicMirror,Tyvonne/MagicMirror,Tyvonne/MagicMirror,Tyvonne/MagicMirror,MichMich/MagicMirror,Tyvonne/MagicMirror