Remove commented code leftover from WP project.
Remove some extraneous brackets.
Remove unused Device determining code.
Consistent code formatting with all the new code. Literally only whitespace changes.