Added access modifiers.
Removed conflicting CGRect extension methods (width & height).
Minor cleanup.