Code refactored, updated unit tests, created category for UIColor.