Replaced deprecated sizeWithFont
Code format cleanup
Removed iOS6-specific code