Cleaned up the code a bit.
Merge pull request #235 from wordpress-mobile/small-cleanup

Cleaned up the code a bit.