Code clean-up.
Code clean-up.
Code clean-up.
Code clean-up.
Code clean-up.
Code clean-up.
Code clean-up.
Merge branch 'master' into twitter-sign-in