Removed anonymous functions
Device Fix
Typo fix