Fixed for snapchat 5.0.2

Also cleaned up a very small amount.